GtkTrayIconX11: Some more refactoring

I like my refactoring better...

diff --git a/gtk/gtktrayicon-x11.c b/gtk/gtktrayicon-x11.c
index d4f0706c6801c60d80a9b6d2590731b3b52a95f3..fdc055b6f3a5e8af927e5804731d26451176f4d2 100644 (file)
--- a/gtk/gtktrayicon-x11.c
+++ b/gtk/gtktrayicon-x11.c
@@ -478,7 +478,6 @@ gtk_tray_icon_get_visual_property (GtkTrayIcon *icon)
   gulong nitems;
   gulong bytes_after;
   int error, result;
-  GdkVisual *visual;
 
   g_assert (icon->priv->manager_window != None);
 
@@ -493,32 +492,31 @@ gtk_tray_icon_get_visual_property (GtkTrayIcon *icon)
                               &bytes_after, &(prop.prop_ch));
   error = gdk_error_trap_pop ();
 
-  visual = NULL;
-
   if (!error && result == Success &&
       type == XA_VISUALID && nitems == 1 && format == 32)
     {
-      VisualID visual_id = prop.prop[0];
-      visual = gdk_x11_screen_lookup_visual (screen, visual_id);
-    }
-
-  if (visual != NULL)
-    {
+      VisualID visual_id;
+      GdkVisual *visual;
       gint red_prec, green_prec, blue_prec;
 
+      visual_id = prop.prop[0];
+      visual = gdk_x11_screen_lookup_visual (screen, visual_id);
       gdk_visual_get_red_pixel_details (visual, NULL, NULL, &red_prec);
       gdk_visual_get_green_pixel_details (visual, NULL, NULL, &green_prec);
       gdk_visual_get_blue_pixel_details (visual, NULL, NULL, &blue_prec);
+      icon->priv->manager_visual = visual;
       icon->priv->manager_visual_rgba =
           (red_prec + blue_prec + green_prec < gdk_visual_get_depth (visual));
     }
   else
-    icon->priv->manager_visual_rgba = FALSE;
-
-  icon->priv->manager_visual = visual;
+    {
+      icon->priv->manager_visual = NULL;
+      icon->priv->manager_visual_rgba = FALSE;
+    }
 
-  /* For the background-relative hack we use when we aren't using a real RGBA
-   * visual, we can't be double-buffered */
+  /* For the background-relative hack we use when we aren't
+   * using a real RGBA visual, we can't be double-buffered
+   */
   gtk_widget_set_double_buffered (GTK_WIDGET (icon), icon->priv->manager_visual_rgba);
 
   if (type != None)